From: Jochen Sprickerhof Date: Sat, 10 Nov 2018 12:47:20 +0000 (+0100) Subject: Drop patches merged upstream X-Git-Tag: archive/raspbian/1.14.0+dfsg-2+rpi1^2~127 X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=1b171f71e746bc7f7b68cb770720b170083c7568;p=pcl.git Drop patches merged upstream --- diff --git a/debian/patches/0001-Fix-PCL_ROOT-path.patch b/debian/patches/0001-Fix-PCL_ROOT-path.patch index bf37a4dc..8cc82492 100644 --- a/debian/patches/0001-Fix-PCL_ROOT-path.patch +++ b/debian/patches/0001-Fix-PCL_ROOT-path.patch @@ -7,10 +7,10 @@ Subject: Fix PCL_ROOT path 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PCLConfig.cmake.in b/PCLConfig.cmake.in -index f4ef6a0..aa3e000 100644 +index 7ec40ba..e707afa 100644 --- a/PCLConfig.cmake.in +++ b/PCLConfig.cmake.in -@@ -717,7 +717,7 @@ if(WIN32 AND NOT MINGW) +@@ -390,7 +390,7 @@ if(WIN32 AND NOT MINGW) get_filename_component(PCL_ROOT "${PCL_DIR}" PATH) else(WIN32 AND NOT MINGW) # PCLConfig.cmake is installed to PCL_ROOT/share/pcl-x.y diff --git a/debian/patches/0001-Generate-pkgconfig-for-2d-module.patch b/debian/patches/0001-Generate-pkgconfig-for-2d-module.patch deleted file mode 100644 index 46d74566..00000000 --- a/debian/patches/0001-Generate-pkgconfig-for-2d-module.patch +++ /dev/null @@ -1,26 +0,0 @@ -From f26bd2f898b45cc24854031e3a13397f315c2099 Mon Sep 17 00:00:00 2001 -From: Sergey Alexandrov -Date: Thu, 31 Aug 2017 11:59:19 +0200 -Subject: [PATCH] Generate pkgconfig for 2d module - ---- - 2d/CMakeLists.txt | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/2d/CMakeLists.txt b/2d/CMakeLists.txt -index afaa99846..5a3db1040 100644 ---- a/2d/CMakeLists.txt -+++ b/2d/CMakeLists.txt -@@ -35,6 +35,9 @@ if(build) - - include_directories("${CMAKE_CURRENT_SOURCE_DIR}/include" ${VTK_INCLUDE_DIRECTORIES}) - -+ set(LIB_NAME "pcl_${SUBSYS_NAME}") -+ PCL_MAKE_PKGCONFIG_HEADER_ONLY("${LIB_NAME}" "${SUBSYS_NAME}" "${SUBSYS_DESC}" "${SUBSYS_DEPS}" "" "" "" "") -+ - #Install include files - PCL_ADD_INCLUDES("${SUBSYS_NAME}" "${SUBSYS_NAME}" ${incs}) - PCL_ADD_INCLUDES("${SUBSYS_NAME}" "${SUBSYS_NAME}/impl" ${impl_incs}) --- -2.19.0 - diff --git a/debian/patches/0002-Dereference-shared_ptr-fix-for-GCC8.patch b/debian/patches/0002-Dereference-shared_ptr-fix-for-GCC8.patch deleted file mode 100644 index eb8df000..00000000 --- a/debian/patches/0002-Dereference-shared_ptr-fix-for-GCC8.patch +++ /dev/null @@ -1,35 +0,0 @@ -From: Jochen Sprickerhof -Date: Sat, 5 May 2018 23:58:13 +0200 -Subject: Dereference shared_ptr, fix for GCC8 - ---- - segmentation/include/pcl/segmentation/ground_plane_comparator.h | 2 +- - segmentation/include/pcl/segmentation/plane_coefficient_comparator.h | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/segmentation/include/pcl/segmentation/ground_plane_comparator.h b/segmentation/include/pcl/segmentation/ground_plane_comparator.h -index e39354d..f96f38b 100644 ---- a/segmentation/include/pcl/segmentation/ground_plane_comparator.h -+++ b/segmentation/include/pcl/segmentation/ground_plane_comparator.h -@@ -147,7 +147,7 @@ namespace pcl - const std::vector& - getPlaneCoeffD () const - { -- return (plane_coeff_d_); -+ return (*plane_coeff_d_); - } - - /** \brief Set the tolerance in radians for difference in normal direction between neighboring points, to be considered part of the same plane. -diff --git a/segmentation/include/pcl/segmentation/plane_coefficient_comparator.h b/segmentation/include/pcl/segmentation/plane_coefficient_comparator.h -index 9c94813..a21725a 100644 ---- a/segmentation/include/pcl/segmentation/plane_coefficient_comparator.h -+++ b/segmentation/include/pcl/segmentation/plane_coefficient_comparator.h -@@ -141,7 +141,7 @@ namespace pcl - const std::vector& - getPlaneCoeffD () const - { -- return (plane_coeff_d_); -+ return (*plane_coeff_d_); - } - - /** \brief Set the tolerance in radians for difference in normal direction between neighboring points, to be considered part of the same plane. diff --git a/debian/patches/0006-Simplify-and-fix-find-flann.patch b/debian/patches/0006-Simplify-and-fix-find-flann.patch deleted file mode 100644 index 9c3786dc..00000000 --- a/debian/patches/0006-Simplify-and-fix-find-flann.patch +++ /dev/null @@ -1,134 +0,0 @@ -From: Jochen Sprickerhof -Date: Sun, 14 Oct 2018 21:02:49 +0200 -Subject: Simplify and fix find flann - ---- - PCLConfig.cmake.in | 44 +-------------------------------- - cmake/Modules/FindFLANN.cmake | 57 ++----------------------------------------- - 2 files changed, 3 insertions(+), 98 deletions(-) - -diff --git a/PCLConfig.cmake.in b/PCLConfig.cmake.in -index aa3e000..f192ea5 100644 ---- a/PCLConfig.cmake.in -+++ b/PCLConfig.cmake.in -@@ -415,51 +415,9 @@ endmacro(find_rssdk) - - #remove this as soon as flann is shipped with FindFlann.cmake - macro(find_flann) -- if(PCL_ALL_IN_ONE_INSTALLER) -- set(FLANN_ROOT "${PCL_ROOT}/3rdParty/Flann") -- elseif(NOT FLANN_ROOT) -- get_filename_component(FLANN_ROOT "@FLANN_INCLUDE_DIRS@" PATH) -- endif(PCL_ALL_IN_ONE_INSTALLER) - if(PKG_CONFIG_FOUND) -- pkg_check_modules(PC_FLANN flann) -+ pkg_check_modules(FLANN flann) - endif(PKG_CONFIG_FOUND) -- -- find_path(FLANN_INCLUDE_DIRS flann/flann.hpp -- HINTS ${PC_FLANN_INCLUDEDIR} ${PC_FLANN_INCLUDE_DIRS} -- "${FLANN_ROOT}" "$ENV{FLANN_ROOT}" -- PATHS "$ENV{PROGRAMFILES}/flann 1.6.9" "$ENV{PROGRAMW6432}/flann 1.6.9" -- "$ENV{PROGRAMFILES}/flann" "$ENV{PROGRAMW6432}/flann" -- PATH_SUFFIXES include) -- -- find_library(FLANN_LIBRARY -- NAMES flann_cpp_s flann_cpp -- HINTS ${PC_FLANN_LIBDIR} ${PC_FLANN_LIBRARY_DIRS} "${FLANN_ROOT}" "$ENV{FLANN_ROOT}" -- PATHS "$ENV{PROGRAMFILES}/flann 1.6.9" "$ENV{PROGRAMW6432}/flann 1.6.9" -- "$ENV{PROGRAMFILES}/flann" "$ENV{PROGRAMW6432}/flann" -- PATH_SUFFIXES lib) -- -- find_library(FLANN_LIBRARY_DEBUG -- NAMES flann_cpp_s-gd flann_cpp-gd flann_cpp_s flann_cpp -- HINTS ${PC_FLANN_LIBDIR} ${PC_FLANN_LIBRARY_DIRS} "${FLANN_ROOT}" "$ENV{FLANN_ROOT}" -- PATHS "$ENV{PROGRAMFILES}/flann 1.6.9" "$ENV{PROGRAMW6432}/flann 1.6.9" -- "$ENV{PROGRAMFILES}/flann" "$ENV{PROGRAMW6432}/flann" -- PATH_SUFFIXES lib) -- -- find_package_handle_standard_args(Flann DEFAULT_MSG FLANN_LIBRARY FLANN_INCLUDE_DIRS) -- if(FLANN_FOUND) -- get_filename_component(FLANN_LIBRARY_PATH ${FLANN_LIBRARY} PATH) -- if(FLANN_LIBRARY_DEBUG) -- get_filename_component(FLANN_LIBRARY_DEBUG_PATH ${FLANN_LIBRARY_DEBUG} PATH) -- set(FLANN_LIBRARY_DIRS ${FLANN_LIBRARY_PATH} ${FLANN_LIBRARY_DEBUG_PATH}) -- set(FLANN_LIBRARIES optimized ${FLANN_LIBRARY} debug ${FLANN_LIBRARY_DEBUG}) -- else(FLANN_LIBRARY_DEBUG) -- set(FLANN_LIBRARY_DIRS ${FLANN_LIBRARY_PATH}) -- set(FLANN_LIBRARIES ${FLANN_LIBRARY}) -- endif(FLANN_LIBRARY_DEBUG) -- if("${FLANN_LIBRARY}" MATCHES "flann_cpp_s") -- set(FLANN_DEFINITIONS ${FLANN_DEFINITIONS} -DFLANN_STATIC) -- endif("${FLANN_LIBRARY}" MATCHES "flann_cpp_s") -- endif(FLANN_FOUND) - endmacro(find_flann) - - macro(find_VTK) -diff --git a/cmake/Modules/FindFLANN.cmake b/cmake/Modules/FindFLANN.cmake -index b5739dc..2f03ea6 100644 ---- a/cmake/Modules/FindFLANN.cmake -+++ b/cmake/Modules/FindFLANN.cmake -@@ -1,61 +1,8 @@ --############################################################################### --# Find FLANN --# --# This sets the following variables: --# FLANN_FOUND - True if FLANN was found. --# FLANN_INCLUDE_DIRS - Directories containing the FLANN include files. --# FLANN_LIBRARIES - Libraries needed to use FLANN. --# FLANN_DEFINITIONS - Compiler flags for FLANN. --# If FLANN_USE_STATIC is specified and then look for static libraries ONLY else --# look for shared ones -- --if(FLANN_USE_STATIC) -- set(FLANN_RELEASE_NAME flann_cpp_s) -- set(FLANN_DEBUG_NAME flann_cpp_s-gd) --else(FLANN_USE_STATIC) -- set(FLANN_RELEASE_NAME flann_cpp) -- set(FLANN_DEBUG_NAME flann_cpp-gd) --endif(FLANN_USE_STATIC) -- - find_package(PkgConfig QUIET) --if (FLANN_FIND_VERSION) -- pkg_check_modules(PC_FLANN flann>=${FLANN_FIND_VERSION}) --else(FLANN_FIND_VERSION) -- pkg_check_modules(PC_FLANN flann) --endif(FLANN_FIND_VERSION) -- --set(FLANN_DEFINITIONS ${PC_FLANN_CFLAGS_OTHER}) -- --find_path(FLANN_INCLUDE_DIR flann/flann.hpp -- HINTS ${PC_FLANN_INCLUDEDIR} ${PC_FLANN_INCLUDE_DIRS} "${FLANN_ROOT}" "$ENV{FLANN_ROOT}" -- PATHS "$ENV{PROGRAMFILES}/Flann" "$ENV{PROGRAMW6432}/Flann" -- PATH_SUFFIXES include) -- --find_library(FLANN_LIBRARY -- NAMES ${FLANN_RELEASE_NAME} -- HINTS ${PC_FLANN_LIBDIR} ${PC_FLANN_LIBRARY_DIRS} "${FLANN_ROOT}" "$ENV{FLANN_ROOT}" -- PATHS "$ENV{PROGRAMFILES}/Flann" "$ENV{PROGRAMW6432}/Flann" -- PATH_SUFFIXES lib) -- --find_library(FLANN_LIBRARY_DEBUG -- NAMES ${FLANN_DEBUG_NAME} ${FLANN_RELEASE_NAME} -- HINTS ${PC_FLANN_LIBDIR} ${PC_FLANN_LIBRARY_DIRS} "${FLANN_ROOT}" "$ENV{FLANN_ROOT}" -- PATHS "$ENV{PROGRAMFILES}/Flann" "$ENV{PROGRAMW6432}/Flann" -- PATH_SUFFIXES lib) -- --if(NOT FLANN_LIBRARY_DEBUG) -- set(FLANN_LIBRARY_DEBUG ${FLANN_LIBRARY}) --endif(NOT FLANN_LIBRARY_DEBUG) -- --set(FLANN_INCLUDE_DIRS ${FLANN_INCLUDE_DIR}) --set(FLANN_LIBRARIES optimized ${FLANN_LIBRARY} debug ${FLANN_LIBRARY_DEBUG}) -- --include(FindPackageHandleStandardArgs) --find_package_handle_standard_args(FLANN DEFAULT_MSG FLANN_LIBRARY FLANN_INCLUDE_DIR) -- --mark_as_advanced(FLANN_LIBRARY FLANN_LIBRARY_DEBUG FLANN_INCLUDE_DIR) -+pkg_check_modules(FLANN flann) - - if(FLANN_FOUND) -+ set(FLANN_FOUND TRUE) - message(STATUS "FLANN found (include: ${FLANN_INCLUDE_DIRS}, lib: ${FLANN_LIBRARIES})") - if(FLANN_USE_STATIC) - add_definitions(-DFLANN_STATIC) diff --git a/debian/patches/2338.patch b/debian/patches/2338.patch deleted file mode 100644 index 29875ea7..00000000 --- a/debian/patches/2338.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 2309bdab20fb2a385d374db6a87349199279db18 Mon Sep 17 00:00:00 2001 -From: Maarten de Vries -Date: Mon, 11 Jun 2018 16:02:11 +0200 -Subject: [PATCH] outofcore: Explictly use mt19937 random generator for boost - 1.67. - ---- - outofcore/include/pcl/outofcore/impl/octree_disk_container.hpp | 2 +- - outofcore/include/pcl/outofcore/octree_disk_container.h | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/outofcore/include/pcl/outofcore/impl/octree_disk_container.hpp b/outofcore/include/pcl/outofcore/impl/octree_disk_container.hpp -index 7d261259ed..2cda7afae0 100644 ---- a/outofcore/include/pcl/outofcore/impl/octree_disk_container.hpp -+++ b/outofcore/include/pcl/outofcore/impl/octree_disk_container.hpp -@@ -74,7 +74,7 @@ namespace pcl - OutofcoreOctreeDiskContainer::rand_gen_ (static_cast (std::time(NULL))); - - template -- boost::uuids::random_generator OutofcoreOctreeDiskContainer::uuid_gen_ (&rand_gen_); -+ boost::uuids::basic_random_generator OutofcoreOctreeDiskContainer::uuid_gen_ (&rand_gen_); - - template - const uint64_t OutofcoreOctreeDiskContainer::READ_BLOCK_SIZE_ = static_cast (2e12); -diff --git a/outofcore/include/pcl/outofcore/octree_disk_container.h b/outofcore/include/pcl/outofcore/octree_disk_container.h -index 9978b9cefc..320ce29fd7 100644 ---- a/outofcore/include/pcl/outofcore/octree_disk_container.h -+++ b/outofcore/include/pcl/outofcore/octree_disk_container.h -@@ -296,7 +296,7 @@ namespace pcl - - static boost::mutex rng_mutex_; - static boost::mt19937 rand_gen_; -- static boost::uuids::random_generator uuid_gen_; -+ static boost::uuids::basic_random_generator uuid_gen_; - - }; - } //namespace outofcore diff --git a/debian/patches/2422.patch b/debian/patches/2422.patch deleted file mode 100644 index c322646f..00000000 --- a/debian/patches/2422.patch +++ /dev/null @@ -1,23 +0,0 @@ -From 6257edf55b10ee1aa0146181a83acc5f014c91ac Mon Sep 17 00:00:00 2001 -From: Sergey Alexandrov -Date: Sun, 9 Sep 2018 14:50:06 -0400 -Subject: [PATCH] Newer versions of Boost complain about floating-point - argument - ---- - test/io/test_grabbers.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/test/io/test_grabbers.cpp b/test/io/test_grabbers.cpp -index 25c5b75e10..004bc070d1 100644 ---- a/test/io/test_grabbers.cpp -+++ b/test/io/test_grabbers.cpp -@@ -49,7 +49,7 @@ TEST (PCL, PCDGrabber) - grabber.registerCallback (fxn); - grabber.start (); - // 1 second should be /plenty/ of time -- boost::this_thread::sleep (boost::posix_time::microseconds (1E6)); -+ boost::this_thread::sleep (boost::posix_time::seconds (1)); - grabber.stop (); - - //// Make sure they match diff --git a/debian/patches/series b/debian/patches/series index 59100491..1ae14fe8 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,6 +1 @@ 0001-Fix-PCL_ROOT-path.patch -0002-Dereference-shared_ptr-fix-for-GCC8.patch -2422.patch -2338.patch -0001-Generate-pkgconfig-for-2d-module.patch -0006-Simplify-and-fix-find-flann.patch